Merge with xenppc-unstable.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 9 Aug 2006 17:04:20 +0000 (18:04 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 9 Aug 2006 17:04:20 +0000 (18:04 +0100)

Trivial merge